# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1145+1.1069.215.2 -> 1.1146 # include/asm-ia64/mmu_context.h 1.5.2.2 -> 1.12 # include/asm-ia64/page.h 1.7.1.2 -> 1.12 # arch/ia64/kernel/setup.c 1.11.2.4 -> 1.24 # arch/ia64/kernel/ivt.S 1.8.1.2 -> 1.13 # arch/ia64/mm/Makefile 1.1.1.5 -> 1.8 # include/asm-ia64/pgtable.h 1.13.1.1 -> 1.15 # include/asm-ia64/processor.h 1.16.2.5 -> 1.30 # include/asm-ia64/tlb.h 1.2.1.1 -> 1.4 # arch/ia64/mm/init.c 1.7.3.4 -> 1.26 # arch/ia64/kernel/acpi.c 1.6.4.6 -> 1.35 # include/asm-ia64/xor.h 1.2.1.2 -> 1.6 # arch/ia64/kernel/sys_ia64.c 1.9.2.2 -> 1.14 # arch/ia64/hp/common/sba_iommu.c 1.1.3.4 -> 1.22 # arch/ia64/config.in 1.13.4.7 -> 1.36 # diff -Nru a/include/asm-ia64/page.h b/include/asm-ia64/page.h --- a/include/asm-ia64/page.h Thu Jan 22 12:38:25 2004 +++ b/include/asm-ia64/page.h Thu Jan 22 12:38:25 2004 @@ -59,6 +59,7 @@ #endif #define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ + #ifdef __ASSEMBLY__ # define __pa(x) ((x) - PAGE_OFFSET) # define __va(x) ((x) + PAGE_OFFSET)